From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 26 Apr 2014 23:06:13 +0000 (+0200)
Subject: calendar: Don't mark translations from GTK+ for translation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2515
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6ece67b6545e88dbfe99db40609cfebd49bf42b4;p=gnome-shell.git

calendar: Don't mark translations from GTK+ for translation

The order in which month and year are displayed is controlled by
a "special" translated string in GTK+. We pick up the translation
from there, so make sure that it doesn't get translated again
in gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=715042
---

diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 4cd285053..87bafb4de 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -14,6 +14,9 @@ const Shell = imports.gi.Shell;
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
 const SHOW_WEEKDATE_KEY = 'show-weekdate';
 
+// alias to prevent xgettext from picking up strings translated in GTK+
+const gtk30_ = Gettext_gtk30.gettext;
+
 // in org.gnome.desktop.interface
 const CLOCK_FORMAT_KEY        = 'clock-format';
 
@@ -387,7 +390,7 @@ const Calendar = new Lang.Class({
 
         // Find the ordering for month/year in the calendar heading
         this._headerFormatWithoutYear = '%B';
-        switch (Gettext_gtk30.gettext('calendar:MY')) {
+        switch (gtk30_('calendar:MY')) {
         case 'calendar:MY':
             this._headerFormat = '%B %Y';
             break;